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

Change-Id: I588ac2ab41a6313e9cae222421773512ee37ce6e