Merge "LayoutInflater: Special case well-known View constructors" am: 8b480c4c81
am: 0c9d6a5c86

Change-Id: Ic7b2abf1364a7805073b17f506032be1f08b6264