Clean Up AndroidDeviceConfiguration and Unit Tests