Merge "rootdir: Add ability to add additional adb_debug.prop values" into main