Merge "stagefright: move to system_ext" am: 9fe6ffa891 am: caf501872d

Change-Id: I5f111a978b5df1d9323d1f1acb8d82a4151a7c63