Bug: 37501326 Test: verify builds and runtests.sh Change-Id: I7c5d2e8a60f73cfc946dcdfbbb63d111bda5a247