Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in Makefile

The BLOCKSTORAGESCALE and SWIFTSTORAGESCALE vars were incorrectly
ignored in the Makefile (and forcibly set to 0)

Change-Id: I37614153d8c87d25aa17e759fcd228a8a1fda4a4
Merge "Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in Makefile"