Layout updates from the last 16 months.
(From OE-Core rev: 22ae7375bb03531349060f11a4f2bfc99d851e52)
(From OE-Core rev: 452160980af60807c8ed51eabd291b4bf3ce8348)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>