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

Change-Id: If3d5c25a4cc31d1f64b164ff146b4b6087ad7c3d