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

Change-Id: I2cf251f4b204b343c365356e0e059e586c6b5e2e