Merge "Port CRITICAL_JNI_PARAMS from internal master"
am: f2fe7f0b61

Change-Id: Ie6cdbed1c24281b2ce12de30baf81ada44314c8f