merge 86adb8f
merge 86adb8f

guestOS/guestOS,ruppmatt/cocotron,crystax/android-vendor-cocotron,cyclaero/cocotron,crystax/android-vendor-cocotron,guestOS/guestOS,yuhangwang/cocotron,gemu2015/cocotron-sierra,cyclaero/cocotron,yuhangwang/cocotron,cjwl/cocotron,yuhangwang/cocotron,crystax/android-vendor-cocotron,gemu2015/cocotron-sierra,cneira/cocotron,cneira/cocotron,gemu2015/cocotron-sierra,JackLian/cocotron,ruppmatt/cocotron,yuhangwang/cocotron,ruppmatt/cocotron,JackLian/cocotron,Suninus/cocotron,cjwl/cocotron,gemu2015/cocotron-sierra,cjwl/cocotron,JackLian/cocotron,cjwl/cocotron,guestOS/guestOS,JackLian/cocotron,cyclaero/cocotron,Suninus/cocotron,Suninus/cocotron,crystax/android-vendor-cocotron,cneira/cocotron,ruppmatt/cocotron,guestOS/guestOS,cyclaero/cocotron,Suninus/cocotron,cneira/cocotron