Rebase with last change and add Logcat export Change-Id: Idc9b444b1bf14b95ff60e8466e94f7eecd875b47 Reviewed-on: https://code.wireshark.org/review/14 Reviewed-by: Anders Broman <a.broman58@gmail.com>