DO NOT MERGE More OMX struct checking

These were lost due to bad merges.

Bug: 27207275
Change-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330
6 files changed