Removed android dependency. Revert this commit to get it back.