1c1
< # Copyright (c) 2012 ARM Limited
---
> # Copyright (c) 2012, 2017 ARM Limited
40c40
< from common.O3_ARM_v7a import O3_ARM_v7a_3
---
> from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3