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

Change-Id: Ib1935f103757a58420b7a1498b3f1edcd558f8b6