am 711951ab: am 78a819d6: am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS

* commit '711951abf0c753eba551ba88817321e4cd7b37d9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS