Merge "bliss: add back ro.adb.secure=1" into o8.1