Merge "DO NOT MERGE More OMX struct checking" into lmp-dev
am: a3c7788  -s ours

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

Change-Id: I3563a97b4eb7a55f005919c4978cd73527327406