Merge "Add back tests for older android versions" into rvc-dev