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