am 4da465a0: Reconcile with ics-factoryrom-release

* commit '4da465a056f7a7322a5a4a0f235fe20e525a6eae':
  Don't crash during full backup when CheckJNI is enabled
tree: 656250d7099c1e0ecc5d5e7ab56524f992313cbd
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/