tree cc6d19de63109391cec2e9f366b3f3867aa3f444
parent 8f9ab6a26b16dacb319c746a0e07152e34cdc372
parent 2dee86d69cf51b38e8b0afac2e8b47ab77380fac
author Colin Cross <ccross@android.com> 1523915240 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1523915240 +0000

Merge changes I3ad2a356,I30955b6e,I1dc6fd99

* changes:
  Add more androidmk translations for android libraries
  Merge matching properties in bpfix
  Make bpfix not modify the input tree