Merge "Make the linter use a JAXB jar instead of the deprecated module." am: 5410a8a911
am: 6089fd5fdd

Change-Id: Ifd4e9b47e5734187370bc0f1b0b785d75067081c