Merge changes Ia3bcece1,Icd26dc1e

* changes:
  Don't compile libaapt with the build number
  aapt: Always use our libz