tree 59e915ef51d0236b0e93345675f52572d3081145
parent e6a24c74c6eceeebb3277206b7dc979dc932440d
parent 446004df9b5725aed49cc734e2ee63b1433d18d6
author Dan Willemsen <dwillemsen@google.com> 1522889823 -0700
committer android-build-merger <android-build-merger@google.com> 1522889823 -0700

Remove duplicate definitions of utility variables am: 4010f14244
am: 446004df9b

Change-Id: I9c84cc08b2d26014afdd570a0182907577bf430f