Merge "Revert "Revert "Separate libstagefright_omx into two libs"""