Merge "Fix for Create Android Project from Existing Project"