To merge the framework-connectivity and framework-connectivity.impl targets, framework-connectivity stubs need to be referenced explicitly in java_sdk_libraries, otherwise the build system will currently see dependency cycles. Bug: 183600168 Test: m Merged-In: I556747f9ba934f8b44b6ea9a518adbccc84ac2a9 Change-Id: I0ff10dcb553115d349e287c9f648d77579158f9d