Merge "MediaScanner: check build fingerprint for system sound scan" into nyc-mr1-dev am: 3fb30a2a43 am: 3d32355d2b
am: b64c915994

Change-Id: I00b630ddd8ced0b342bbe3b54d8e5ed5d53196d4