Merge "Fix ADT after sdkuilib->sdklib reorg"