Merge "aapt2: fix definition of G in Util.h"