Merge "releasetools: Update the path to /default.prop for A/B devices." am: 6d64ff1bf7
am: 6eb5564025

Change-Id: Icd75b3de56e129cc932445b9ec5a00e0ec8525b6