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

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

AndroidX/androidx,androidx/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx