Merge "Further small fixes to increase API compatibility with RI v6." into dalvik-dev