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

Change-Id: I9e89188255fdad31806426eeb3072a9178163bce