Merge tag 'android-7.1.1_r12' of cm14.1 #18

Closed ghost closed 7 years ago