Update dependency to handle dependency loop and Add Android test cases