This reverts commit 252efd70. Reason for revert: breaks git_pi-dev-plus-aosp build Change-Id: Icbccc53a6b860fab17fefcfe54a72b80957482e4