Merge "Export Make config vars to Soong to support Droiddoc"
am: 5d7ec6bdf8

Change-Id: I167b1ced44901589817262b5bb097648fe284968