Merge "stagefright: misc preliminary fixes for HEIF support" into oc-mr1-dev