Merge "Moving IPlayer.aidl to frameworks/av/."