Merge "Split arch data into separate files." am: a7e2a12d38
am: 5b9c5dc0ab

Change-Id: Ib821fda39ffcdd2a96ace08d75899c0e4f35f446