am ad6dd21e: Merge "Remove unused PRODUCT_TAGS"

* commit 'ad6dd21e1ae27941b0c00629b095dd9a9ae2d7c2':
  Remove unused PRODUCT_TAGS