Initial import from android.com
Merge remote-tracking branch 'origin/master'