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

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