Merge "Switch to $(file) instead of a rule to create soong.variables" am: a0d0ea3b5c am: 9ecc0da241
am: 05fda09148

Change-Id: I2e622fbcc0c495969942aecd576d66310b0795b1