This reverts commit ccf7c8a6. Change-Id: Iee618d9ae78e1dcdea4a7ecbe9253821d4d4d015 Test: N9 boot, art tests, Ritz EAAC. Bug: 29516968 Bug: 29517059 Bug: 12687968