This reverts commit 7bc31dc1. Reason for revert: Breaking aosp_master build. Change-Id: I34a5e9889c17e3454a0a86deabcec3c192a3da52