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

Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp

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