This reverts commit 18b7c24177. Bug: 64800246 Test: compilation Change-Id: Iee9561c7d41507a4eab4f901fef67a58ef5624f4
18b7c24177