Merge "Correct valueType attribute for an AVD in test app"