Merge "Update NDK gtest lib names."
am: 56c2a18a50

Change-Id: Ib8b6996027020fa8bc1d17f8d1286915c534d94b