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

* commit '2f8ffa61bee03593a89913806e863f73a8e646b7':
  Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries