Merge "Port CRITICAL_JNI_PARAMS from internal master" am: f2fe7f0b61 am: 260710644c
am: 9ca74917c3

Change-Id: Iaaacc4df06894cb9a97054e553b1bb9019847097