am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom

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