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

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