5e52279256
This will make addition of new architectures less unpleasant. Change-Id: I77c866a63b686e8e70709d08fcf52e8a2d37310a