merge  e0f4fb5
merge  e0f4fb5

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