Refactoring layout parsing code

Change-Id: Iee5b2280cb1e841bcfe91fdcf523de6fa7f7f3b8
3 files changed