Now we have split CXX_WRAPPER from TARGET_CXX and CXX_BARE isn't needed any more. Bug: 22612634 Change-Id: I52c78b0d1b325910e875a786d17f780731778b4b (cherry-pick from commit 9d11a708)