Test: m droid checkapi
Bug: 155164730
Change-Id: I4cf46f173bebf0c35a335054e8dcb96f3bd907a3
Exempt-From-Owner-Approval: Build refactoring.