To get rid of v3, this patch rename all the ViewBuilderV3 to ViewBuilderV21. Change-Id: I84a5cb303b4da4ede6d792f80acd9313756b9f9b Partial-Bug: #1462901