Update for Soong java makefiles.
authorSteven Moreland <smoreland@google.com>
Wed, 11 Oct 2017 16:23:54 +0000 (16:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 16:23:54 +0000 (16:23 +0000)
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9


Trivial merge