am c76640b6: am 4d758343: Merge "Fix dependent vm-test jar path." into froyo