Merge changes I4a7a36e0,I7dacfec1

* changes:
  Build 32-bit and 64-bit binaries for test apps
  Normalize spacing in makefiles