Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"