Merge "Make sdk member type related types and vars type specific" am:...

Merge "Make sdk member type related types and vars type specific" am: eb784f15 am: f9e90d95 am: f33c7cfa am: 6cd482dc

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1808898

Change-Id: I8c4fcdebad686ea527dd6aacc21e119e1d2db9ce