am 6f2bb44b: am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread

Merge commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f'

* commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f':
  Use stagefright (instead of OpenCore) authoring engine by default