Fix was commited in "Fix frame size issue with 64-bit" This reverts commit 7eebd95b. Change-Id: I799b7fcab14ae24471d2f9d6d3a5e5cedd4aa7b8