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

Change-Id: I524359c9038b6b407a473033881a801fdaded184