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

Change-Id: I6c8cfc324a62040b7df5e3f2f8c4dccfcbf09b4e