7998429c21
This reverts commit 96be8a7b73.
Reverting since this is dependent on a device libs change which is not yet in mainline.
Change-Id: I094781b868f39995d1eecb41488c1a1a0147b787