am 2c4d1b45: am 049617b4: am ddbcd6c0: Merge "API Cleanup: Remove use of VideoState class." into mnc-dev

* commit '2c4d1b454df8e8decc32abaabf247064c20d5551':
  API Cleanup: Remove use of VideoState class.