Merge "Make /data/media case insensitive" am: 02e5e1ea22 am: 7954933e64 am: 386351edcc

Change-Id: Icedfce74d3160c302b1fe7e4cc880c44cbcacfed