Merge "Use libaudio instead of libmedia" am: 9581957a57 am: 1cb6cefdb3
am: ed75323e27

Change-Id: I872e4afd6b43ec49b53622a113307941e2025817