Long-overdue commit of android layout work