Merge "Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86  -s ours am: 3130b4e146  -s ours am: d857569fda  -s ours am: c2f710ed1f  -s ours"