Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev am: fda16129 am: 696abc9f -s ours Change-Id: I269b9bef214a29c26ce77a10aad66324affc4edb