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

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