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

Change-Id: I27a139fa343b64e8f3fcf02925605877eb10a65d