Merge "Revert "v2p-aarch64: Use sdcard partition rather than emulated storage"" into linaro-jb