Merge "Add more runtime options." into dalvik-dev