Updated scripts to use proper memory size for 32/64-bit (#1636 et al)

Change-Id: I07a2f6adb5f3e1be733910f56cfbddb78fef9dbf