Merge "More video related API fixes" into mnc-dev
tree: 598f37602a6e19017bfb7842f731b9db4d5c0b64
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags