Refactor Android.gtest.mk more am: eac38a141a am: 317c442ee3

Change-Id: Ib241219f7b9977f8eb6b14063af34941c130859c