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

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

Change-Id: I6f7d71da3570c7a68f14f8762e1e055d91d7b86e