Merge "Convert libstagefright to Android.bp" am: 2e112d7777
am: 66819d28ba

Change-Id: I5f281c4a04a626b383dbefe210187223411f32ca