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