Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries"