Fix test for no-prebuild. am: aeb9a16a28
am: 0222c72ec1

Change-Id: I5df515f1436099cd04fd56c43f6ae280b87d3d36