am db9a5974: am ffda0d5e: am f05c07d3: Merge "Update support lib build for new HAL changes."

* commit 'db9a59742bd615f7e0b2f585253a080a700eecfe':
  Update support lib build for new HAL changes.