This reverts commit 846c5acd90.
Reason for revert: breaks sdk target on aosp-master
Change-Id: Iea8f2c676533e61a5bea06d17719fea630340b20
This reverts commit 846c5acd90.
Reason for revert: breaks sdk target on aosp-master
Change-Id: Iea8f2c676533e61a5bea06d17719fea630340b20