Merge "Revert "Weaver HAL""
am: 085aca0ee3

Change-Id: I3de24c85b2113e38baa413f1992577710c630c80