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

Change-Id: I4b89183296a2cf1dfed459a7a6387407d88c4673