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

Change-Id: I02937c5323fc6523b796cc6282ddc38a172b3fa0