Merge "Move Theme::Entry definition to top of file" into udc-dev-plus-aosp