Refactor Android.gtest.mk more
am: eac38a141a

Change-Id: Ic0b2abe1ec7dfde2e2e2340f97cc271b0f1a98ff