Merge \"Use visible paths when cleaning up MediaStore.\" into nyc-mr1-dev
am: 8ee0a67ba7

Change-Id: I387c13b1208ebdf05d03b4d172d538015dc3c6a5