Merge "ADT templates: BlankActivity and LoginActivity cleanup."