Merge "Weaver HAL"
am: 2f5a5e10f7

Change-Id: Ibe908202b5f86478dcea71b4eb75d9a1fca6f825