[automerger skipped] Merge "ART: Properly check for attached thread in CheckJNI" into pi-dev am: 51a4dce2 -s ours am: 900b405d -s ours Change-Id: If1ac7c2bcf3ebf210fd002792471b3628e2d1e45