Merge "Add deduping for string data and debug infos"
am: a84db1edf0

Change-Id: Iaa02fc6f7eb425470fd382fe65d77e5257db45c9