Merge "Adding an option to disable puffdiff" into main am: 7383a917 am:...

Merge "Adding an option to disable puffdiff" into main am: 7383a917 am: 507d4b4e am: fe65761c am: cc7f9f65 am: 1607fd63

Original change: https://android-review.googlesource.com/c/platform/build/+/2686868



Change-Id: Ib14a41999ce936cea6ff35dd18deed4ffc5883b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>