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

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