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

Change-Id: I706bf8992bf8090b5c818418b14278a7bf9e3637