Merge "Add 'com.android.media' to apex_available of libhardware_headers"