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

Change-Id: Id1ac75606df1b8bf99281febf5c7266de6889457