Merge "Use java variables from soong" am: ae470d419a
am: 65990cdfa5

Change-Id: Iddf657c8fa6396cf91352a4637dd085436f5ef38