Merge "Make libstagefright free from libstagefright_omx" into pi-dev am: 9d2db5acda
am: c600a58e64

Change-Id: I1a9ae56e63d0e09997205b375819515faa7336f1