officially build CBS against system_current

Bug: 135956699
Test: Build
Change-Id: Ife8de67154d7f8ce55f8936cb7eb824d91e526db
2 files changed