Merge "Remove generate-operator-out.py symlinks"
am: 5b3628898b

Change-Id: I153a534b58067040a6272a42d5e559fbdeec213b