Merge "Add AMBA bus support to platform devices"