merge 2fda5f3
merge 2fda5f3

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