Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I1fd16a4e709abafcaf1747f673650727cb683dd1
tree: f5cac0bf2fb7a31e276679a83c3f8f6d77e4e895
  1. videocodec/
  2. Android.mk
  3. AUTHORS
  4. COPYING
  5. ebuild.mk
  6. README