Merge "Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."" am: 65ca0eec96

Change-Id: I971f67ad6473c41c530a8525c34e808fb3f35ac1