This reverts commit 150b7ce48a. Upstream has an equivalent feature now, drop the Android-specific version. Bug: 120440300 Signed-off-by: Quentin Perret <qperret@google.com> Change-Id: I2298a79b9ca1f5798643c3ab09b2ee63630e0e89
150b7ce48a