Merge "aapt: remove duplicate definition of ZD"