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

Change-Id: I26d740fab908b5d1bdbf986d7b9ae5497e507e5e