merge  67ab18d
merge  67ab18d

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