Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries" am: 2f8ffa61be
am: 7557ad2bbd

* commit '7557ad2bbdcf365f96a5df810cbfcc43f1766dfd':
  Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries