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

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

Change-Id: Ia2b23ddbfe4f540d346b6ba0bbb2b93ab5d4c140