Merge "Support built-in ramzswap" into gingerbread