Change "ENGINE=HEAP" to "ENGINE=MEMORY"

"Memory" is the preferred term, see
https://dev.mysql.com/doc/refman/5.0/en/memory-storage-engine.html

Change-Id: I1fd05d027903af6023002dd357998ce5f2606708
Merge "Change "ENGINE=HEAP" to "ENGINE=MEMORY""