AOSP build broken. Bug: 71914112 This reverts commit 2f87d7b2. Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69