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

Change-Id: I857c06305e5aaa89557ed543424f2326e10275cd