Merge component-android and component-akka