am 75d6daa2: Merge changes I4a7a36e0,I7dacfec1

* commit '75d6daa22223cda60c6f7ba057abe8d95389737d':
  Build 32-bit and 64-bit binaries for test apps
  Normalize spacing in makefiles