Update from AOSP

This update brings the source inline with 4.4.1_r1.

As a side note, I would have included the entire history from Google rather than a single commit import.  It makes merging in new code from them very difficult.