Merge "Make android_logger_set_prune_list() sane" am: d1ac612879
am: bbfa69f0d8

Change-Id: I3f9895e78bafe82c60438b518efa66b5c9aaac1c