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

Change-Id: Ica3ce7bf6b235c968890befefebbbcfb03e7ea86