Merge "Logcatd: Add new properties control logcat file size and file count." am: 79b0682ec9
am: b27e49fa8a

Change-Id: I6f99e7127877fcc585bf4bbb56cff4c8843b12e9