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

Change-Id: I32717473ff1d38f8abca819eb0b21ccfc9153d59