This reverts commit 41004ff411. Bug: 64800246 Test: compilation Change-Id: I4f5e3cd23001b9d94b3f6dc9fcfe731a90650e6e
41004ff411