Merge "Disable test-660 for no-prebuild"
am: 2c2e13ec24

Change-Id: Ia13e6ada3d8ae1ffb6658f055cbcb619804d50c9