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

Change-Id: I8c22645a4148dcbc80f30b6d54ccd4926d4194c1