Merge "media: handle AVC constrained profiles" into oc-mr1-dev
am: 794a8f9dc7

Change-Id: Iaeb27b9c5c1342e58b0feb93a29728f3ff1e3e5e