Merge "Make libstagefright free from libstagefright_omx" into pi-dev