Merge "Split the source code into an android_library" into main