Merge "Merge "DO NOT MERGE More OMX struct checking" into klp-dev am: c002126cb0 am: e25ff0130e am: f54f5b54bd  -s ours am: a79dd03ce6  -s ours am: 4567d7b780 am: 24bb5389ee am: ee8c091aea  -s ours" into mnc-dev am: 0bbfc1a781
am: 8aa3c63

* commit '8aa3c638787d604e09591c6e863ba5dcdfb7893b':
  DO NOT MERGE More OMX struct checking

Change-Id: Id12bde80bad54ccebea8476f4f2fccb869e510f7