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

Change-Id: I3700ae08d2fca2301e4d04bb21adf6a8b5457ec6