Merge "Use java variables from soong"
am: ae470d419a

Change-Id: I9df55763c0dd2a366fa40a07e7d06de7e29feb4c