Merge \"Make MediaScanner extract \"date taken\" from videos, if present\" into nyc-mr1-dev
am: d63dbfdb6b

Change-Id: I5ea0eafbc2e122f2756098ac98b50c03fe773be5