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

Change-Id: I7687c3933303c57418a9b7797d995ae7f955ead2