Merge "Merge "Revert "Make libbinder not available to media.swcodec apex"" into rvc-dev am: 9adccca5dd am: 2cbcbe827c am: e5381566a0" into rvc-qpr-dev-plus-aosp