Merge "Limit btsnoop file size (3/8)" am: 37cad12cb1 am: e429211064
am: c1da2a0341  -s ours

Change-Id: I91b79208a1afea91ab83bfe9b687710945f66742