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

Change-Id: I53fffa12f748ebf97462cd0f5bc70d4478e027d5