Merge "Remove dependency of libhardware_legacy" into oc-dev
am: ba2420a87f

Change-Id: Ib9909a371adcc72ba13d684429c852242044737b