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

* commit 'c884fc9f26b1707f89ae4e1e163e051996f96bb8':
  AAPT emits error for res with no 'default' product