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

Change-Id: Ib4d969c42e1ee7d3992a3a725b27d826c4b0d31e