Merge "Update layoutlib following Changes I2500bd4c and If456266f"