Merge "Remove configuration exported from Soong"