Merge "Tweaked the cleanup scripts to handle uapi and aarch64 headers."