Merge "Add some Android-changed markers to boxed primitive types."