This reverts commit a3dd94a1bb. Bug:133481659 Test: build Change-Id: Ib23609315f3446223521612621fe54469537c172 Signed-off-by: Wei Wang <wvw@google.com>
a3dd94a1bb