am ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."

* commit 'ea54b50e560d911f3b7efd2638cf1f56afdd834d':
  Relax the constraint of 64bit build environment.