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

Change-Id: I03e2c19b3f158ab9303ee027a6e9e106f726ab4c