board-express: pull in lots of changes from m2* devices

Change-Id: I7e9f1bda02e15a91afaf46aa05f0afa7da5bb102