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

Change-Id: Iddcddaaef1665beb0c733d1e32fe02e10cfbeaeb