Merge branch 'amba' into for-armsoc