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

Change-Id: Ibc670da31571add92a312b7673be376be67f9072