maguro: Merge 'android-4.0.4_r1.1'