merge df7d82b
merge df7d82b

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