am 27c0029d: am 75d6daa2: Merge changes I4a7a36e0,I7dacfec1

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