Work around for duplicate symbols in static libs

Bug: 15110069
Change-Id: I24757ad60d94ac250065e2680871d0059e8c240d
3 files changed