This reverts commit e6d16155. Bug: 37480230 Test: build Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48