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

Change-Id: I249857b8bc87d79af53816fac698712d97bb69f3