Merge "Rename base/ to android-base/." am: 5986d9f263 am: a77731e14d
am: fbdec4f643

* commit 'fbdec4f6434e7040f410b99fb9a8e7d1f809e151':
  Rename base/ to android-base/.