Merge "Reduce unnecessary rebuilds of .dex files with restat=1"