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

Change-Id: I4313c8722c41e4354c26432394e4733da3fce2cf