Merge "Fixing the last API deltas between Dalvik and Java 6." into dalvik-dev