Merge "target: apq8084: Change scratch address according to memory map"