tree 5e6bb9484903d57afecb27f0035a12dee1a271cd
parent 2b05681de0cb6f58f4bd66a67035899b5984c066
author Jason Monk <jmonk@google.com> 1523571180 -0400
committer Jason Monk <jmonk@google.com> 1523571282 -0400

Fix breakages in SDK drop

Test: buildOnServer
Bug: 73123786
Change-Id: Ic8f774caa4ae1c00119e58d9e6fd31cc68016c94