[automerger skipped] Merge "[view compilation] Add --compile-layouts flag to `pm compile`" am: 52cf4adf70 am: 581c43404a
am: 43986e38b3 -s ours
am skip reason: change_id If6455e1b9b0542a36882af9f3e29d0185a53393c with SHA1 a1485f61e9 is in history

Change-Id: I46cd9e14f93905f95bd03cf11023c735427da48b