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

Change-Id: Ica9f3208cb221c8b9aeb0aea373a36c72d5fb142