Merge "Fix HALs to not have transitive depends." into oc-mr1-dev
am: cf0ee37180

Change-Id: Idf2b0e4e4e27d1fa92359d1226f9a0608be133cd