Merge "ART: Fix missing \ in Android.gtest.mk" am: 707ad2ebe6
am: 67554e05aa

Change-Id: I91eaaa10a3f1ae2488cbf5a08fa4ed9e11ce9233