merge from gingerbread
merge from gingerbread

Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823

VanirAOSP/external_protobuf,xin3liang/platform_external_protobuf,geekboxzone/lollipop_external_protobuf,VanirAOSP/external_protobuf,Evervolv/android_external_protobuf,geekboxzone/lollipop_external_protobuf,MonkeyZZZZ/platform_external_protobuf,MonkeyZZZZ/platform_external_protobuf,android-ia/platform_external_protobuf,cubieboard/openbox_external_protobuf,VanirAOSP/external_protobuf,MonkeyZZZZ/platform_external_protobuf,CyanogenMod/android_external_protobuf,CyanogenMod/android_external_protobuf,MonkeyZZZZ/platform_external_protobuf,geekboxzone/mmallow_external_protobuf,Evervolv/android_external_protobuf,MonkeyZZZZ/platform_external_protobuf,android-ia/platform_external_protobuf,Evervolv/android_external_protobuf,geekboxzone/lollipop_external_protobuf,ThirdProject/android_external_protobuf,geekboxzone/lollipop_external_protobuf,CyanogenMod/android_external_protobuf,xin3liang/platform_external_protobuf,xin3liang/platform_external_protobuf,geekboxzone/mmallow_external_protobuf,VanirAOSP/external_protobuf,xin3liang/platform_external_protobuf,cubieboard/openbox_external_protobuf,CyanogenMod/android_external_protobuf,ThirdProject/android_external_protobuf,cubieboard/openbox_external_protobuf,cubieboard/openbox_external_protobuf,cubieboard/openbox_external_protobuf,CyanogenMod/android_external_protobuf,android-ia/platform_external_protobuf,geekboxzone/mmallow_external_protobuf,Evervolv/android_external_protobuf,xin3liang/platform_external_protobuf,Evervolv/android_external_protobuf,geekboxzone/mmallow_external_protobuf,ThirdProject/android_external_protobuf,ThirdProject/android_external_protobuf,geekboxzone/mmallow_external_protobuf,android-ia/platform_external_protobuf,geekboxzone/lollipop_external_protobuf,VanirAOSP/external_protobuf