Merge "Fix some vector drawable documentation, clean up fields"