Merge "sdklib: update classpath to get mkidentity from prebuilts"