Merge "Limit btsnoop file size (1/9)" into oc-dev
am: ed5b29d32f  -s ours

Change-Id: I859ba8d0d306e4416bc882802073f6572ceb187f