Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)"
am: f37bea87e8

Change-Id: Id54116fb605fd2156ddd0a636224f59b1b91deb8