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

Change-Id: Ia95ff687620ba564ad5a82ad5923db91d61fe6ed