Merge "[automerger skipped] Merge "updates to libarect_headers to include in media apex modules" into tm-dev am: 1821df6cd7 am: 45b364ead0 -s ours" into tm-d1-dev-plus-aosp