am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"

* commit 'bc0c2c2d2a4cc058ab404f940f0ca65f595e047b':
  DO NOT MERGE: Fix for SW video decoder OMX profile/level query