Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2

Change-Id: Icf33443b17ff5eef494d8b837abf18a2138ca56c