This reverts commit 246e3eed. Reason for revert: broke aosp_bonito-userdebug build Change-Id: Ib613f8f22532fe4588d3ec96aa001de869f8a633