Merge "fastboot: derive device locked state from Android property"