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

Change-Id: I78b873cfa48b26e5f70c8f0d9dc43076f4555411