Merge "Android typo fix exercise, uknown -> unknown Test: refactoring CL. Existing unit tests still pass."