Merge "Revert "Weaver HAL"" am: 085aca0ee3 am: 3db17451c4 am: 87f913b67d
am: 018da84aa8

Change-Id: I9648b75a308381ce6ed77e35988b47982c7fabac