am 3f3fb0c4: Merge "resolve merge conflicts of 598e05b to master."

* commit '3f3fb0c467e47766955cc3e67d1f5f30137429b2':
  Read build.prop file when provided in AVD.
  Simplify build of 64-bit binaries.
  android-configure.sh: Fix linker probe check.
  Generate position-independent binaries.
  mini-glib: Only compile glib-win32.c when needed.
  Remove obsolete HOST_LONGBITS feature check.