Merge "Bring the latest Caliper (r102) into vogar." into dalvik-dev