am 46e63b34: Merge "Better file size estimate" into gingerbread

Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp

* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
  Better file size estimate
tree: 9d931c3acde3ec8062e69688220d97211bfb442e
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/