am c1bc4b26: Rename AOSP builds to aosp_*

* commit 'c1bc4b26d3f33d3ef6aa55027bf8b954416dcc29':
  Rename AOSP builds to aosp_*