Merge "Move tests from java.injected into libcore." into dalvik-dev