Merge "Don't force libcore_private.stubs to be built with java 1.7"