Merge the two repositories AndroidLib and AndroidInternalApis