Fix compiling errors and some layout derps

Change-Id: I6e2b3efeebe101b7b64502b2a479972fb132db1d
Merge "Fix compiling errors and some layout derps" into pac-4.4