am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread

Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on
tree: 2d0c7d4c0e48f2e0e3989406d4bd9f683ec961b3
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/