Bug: 32842314 Test: verify builds and runtests.sh Change-Id: Ia97dfe1c36c95701dd8a4f88707f757cdb7d6bb2