Merge "[automerger skipped] Merge "[layout precompilation] Add testing hook for precompiled layouts" am: 15b86c9037 am: 0b329918fc am: ce7aa1bf68 -s ours am skip reason: change_id Ib6b62d79a9ca7aefefff8639752aa5838e491038 with SHA1 25aa4edaa8 is in history"