am 4da465a0: Reconcile with ics-factoryrom-release

* commit '4da465a056f7a7322a5a4a0f235fe20e525a6eae':
  Don't crash during full backup when CheckJNI is enabled