Merge "Revert "Separate libstagefright_omx into two libs""