Merge "Update droidstubs to use the SdkExt info file"