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

Change-Id: I1a3008000e2bbdc8fbc93bc7d1f10944caf02a2e