Merge "omni: utils: add a script to merge CAF tag" into android-11