Merge "Add logging of what derive_sdk sees"
am: 07f63db9f7

Change-Id: If144484adb1bf194b00f8cf07ce689bcdab61c97