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

* commit '3127286b19112082f3c467c134776794a239654e':
  DO NOT MERGE More OMX struct checking

Change-Id: Iab926fa3439fc3e78509973a726c1e51e753b41a