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

Change-Id: If26dc4c5bb23ea23ed48d35aa8618e0b7f2825a3