Merge "stagefright: add HEIF support" into oc-mr1-dev am: 97ab472f39
am: 6bc7d88181

Change-Id: I570804240719142ebb14ab279befe69b5852d67e