Merge "Fix changed native method delegates in layoutlib for ICS."