Merge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0
am: e25ff0130e

* commit 'e25ff0130ef9fa184afb87e92c184172c8a96f71':
  DO NOT MERGE More OMX struct checking

Change-Id: Ia9767e906a247c330031837c3b0b6415e319c836