Merge "Revert "Revert "Revert "Make libbinder not available to media.sw..."" into rvc-dev