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