Merge "drivers/staging: msm8610: Reduce android log buffer sizes"