am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"

* commit '1bf9f6936e423a686b623752e9f008acefaa1057':
  Use OUT_DIR in atree to find android.jar