am 2cbcbb45: Rename AOSP builds to aosp_*

* commit '2cbcbb45f1e4d2b46d5660d9a8ee2a45f377eef1':
  Rename AOSP builds to aosp_*