Merge "Fix build (track Java class name change)." into dalvik-dev