am 6c7d0605: am 324c1235: Rename AOSP builds to aosp_*

* commit '6c7d0605de994621aa9b3b814951955ac590169a':
  Rename AOSP builds to aosp_*