Merge "Use JDK 17 for art test build am: e1f8e3ccaf am: d578d43420 am: 5d969700f8"