Merge "ART: Properly check for attached thread in CheckJNI" am: cb329022c3
am: f72d1f78df

Change-Id: I903041e9062fab50849b9b209b2cfe6dce0f916c