Merge "Revert "Revert "Revert "Make libbinder not available to media.sw..."" into rvc-dev am: 39bf04a268 am: 4026b4d0f3

Change-Id: If333158ca3b47d3e446461f98480ea40e95149c2