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

Change-Id: Iae61785f81419be17de55ce2c2d159f1b6ec9db1