Merge "Add PRODUCT_FULL_TREBLE." am: 5236e11c54
am: 848e9430bc

Change-Id: Icb27d3a034695ea4367286cf288e460e2feec76e