Merge changes I6e5a1ea6,Id8fb6887

* changes:
  CCodec: fix queue deadline threshold
  CCodec: DummyContainerBuffer to point to non-null memory
tree: 40ba7f11a577840b1d4eea6dff96a95354d26632
  1. codec2/
  2. hooks/
  3. media/
  4. Android.bp
  5. OWNERS