Merge "Fix symbol zip creation with OUT_DIR outside source" am: b1201637a4
am: 346ea91089

Change-Id: I2cd2404ac90cf56aa509de63b75d785191f8a119