merge 6999e81
merge 6999e81

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