Merge "mdm9x25: Update membase and scratch address"