Merge "Ignore ro.adb.secure in user builds."