Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
am: 05973ee604

Change-Id: Ia3b96fb4c8ae5b6d52bac804128b94fe55b094c5