Test: make checkapi Change-Id: Ie55af30767936c1cc1c1543a0b5838a732b82c59
This reverts commit 718428355f5ab75d1a3ef890f86abc52fe018ce8. Fixes: 139833475 Test: make droid Change-Id: I61316a8f314dccb7718bf8ab159e167d554d2525 Merged-In: I61316a8f314dccb7718bf8ab159e167d554d2525