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

Change-Id: Ie2f436b213c2e76286aa988e7cf6b1dc93454e25