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

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