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

Change-Id: I7446b5d35be5b29245e1163586638a55ba243a07