merge  967e85a
merge  967e85a

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