Bringing latest Android code over for 3.0