Merge Razdroid changes