Merge "Add Legacy GSI to fix ApexTest for CTS on GSI" into rvc-dev