Merge "Make /data/media case insensitive" am: 02e5e1ea22

Change-Id: I881108eaacf8cf728d76712dfb14d4edc5bbab6c