Update master

I'll do this over at r.android.com, although it's easier to comment and edit here on github...

In any event, the getLayoutInflator method needs some work.  The null check that was added does not prevent NPE if onCreateDialog returns null.  Also, is there a break statement missing in the switch?