merge  354bfe2
merge  354bfe2

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