merge 05f6a16 andyvn22-cocotron
merge 05f6a16 andyvn22-cocotron

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