Merge "Make logd more aggressive when scanning for the position from which to resume logging." into pi-dev
am: 4ae7d5c34e

Change-Id: I3bcf64a8cb2726e660fc29efc12eb28de194e527