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

* commit '4567d7b7803dc13a65627d5c2765b93e01f2188e':
  DO NOT MERGE More OMX struct checking

Change-Id: Ibb36a00d2d520198a2ebd2871a47309a5ea0d52e