Merge "Add a symlink android-base/ pointing to base/."
am: 1efab7acc5

* commit '1efab7acc5d5b69dced70b6d04070d36f7c9632d':
  Add a symlink android-base/ pointing to base/.