Merge "Extending the maximum length of a boot classpath." into dalvik-dev