piper, and no longer have build glues. Bug: 67682408,73351020 Test: build Merged-In: I8a79c20c62167b6b9e89abe6bc05bf012d750fc5 Change-Id: I8a79c20c62167b6b9e89abe6bc05bf012d750fc5