Merge "logd: test: switch to /data/backup/ for sepolicy avc injection" am: d289e36847 am: 17fc5dad3b am: 0eaa560c7a
am: 212fc3349f

Change-Id: I3d0b151d3892b56db9f68a703021a9991c67c222