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

* commit '5986d9f263d08ef8876656098cbe95b59d310f21':
  Rename base/ to android-base/.