Merge "Rename test apks to avoid case collision"