Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am: 881bc352ee

Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5