Update layers on angstrom 2012.05 branch.