Merge "Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook."