Finish initial merge of Android code