patch for handling 4.2 /data/media/0

Change-Id: I1eb75570bee74417c77168a7c0cf9e0513269d2f