Merge "set ro.adb.secure=1 for user builds"