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

Change-Id: I1775384dc807d8809d92c40dd8597abe43b3edd5