This reverts commit 4f008458. Reason for revert: Build breakage - b/172932743 Bug: 172932743 Change-Id: Iee0a5e2b84e5d89a206b099f75a15e714a332ff4