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

* commit '80bc200d05ef7b753b48ab38ee21375ccb71b37b':
  Add a symlink android-base/ pointing to base/.