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

Change-Id: Ide90033b38ba2d75a5fb08e3078310dda5fec9ac