Merge "AAPT emits error for res with no 'default' product" into klp-dev