Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" am: f37bea87e8 am: d79d4f23ae am: 1a46e916dc
am: 5280d9cd63  -s ours

Change-Id: Idcdfbd5faab5f0676a00e7b646ca0f8fc625fc15