Merge "AAPT: Multiple period legacy support and errors" into pi-dev